From: Alban Browaeys <prahal@yahoo.com>
Date: Sun, 20 Jan 2013 22:45:17 +0000 (+0100)
Subject: Fix overzalous method annotations for drag and drop
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~38^2~24
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=255e2dd704eed7816278db7e1331fb5cae92c80a;p=gtk%2B3.0.git

Fix overzalous method annotations for drag and drop

Functional revert of commit 9c4892f2915.

Fixes introspection scanner warnings like:

  Warning: Gtk: gtk_drag_finish: Methods must belong to the same
  namespace as the class they belong to

That is, the gtk_drag_* functions cannot be methods as they have a
"GdkDragContext" as the instance parameter, and that is not a valid
type for the Gtk namespace.

This is not an introspected ABI change, as the generated introspection
data ignores the annotation.

Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>

https://bugzilla.gnome.org/show_bug.cgi?id=692152
---

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0d244977d9..84861b9438 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -900,7 +900,7 @@ gtk_drag_get_data (GtkWidget      *widget,
 }
 
 /**
- * gtk_drag_get_source_widget: (method)
+ * gtk_drag_get_source_widget:
  * @context: a (destination side) drag context
  *
  * Determines the source widget for a drag.
@@ -936,7 +936,7 @@ gtk_drag_get_source_widget (GdkDragContext *context)
 }
 
 /**
- * gtk_drag_finish: (method)
+ * gtk_drag_finish:
  * @context: the drag context
  * @success: a flag indicating whether the drop was successful
  * @del: a flag indicating whether the source should delete the
@@ -2127,7 +2127,7 @@ out:
 }
 
 /**
- * gtk_drag_set_icon_widget: (method)
+ * gtk_drag_set_icon_widget:
  * @context: the context for a drag. (This must be called 
           with a context for the source side of a drag)
  * @widget: a widget to use as an icon
@@ -2208,7 +2208,7 @@ gtk_drag_set_icon_definition (GdkDragContext     *context,
 }
 
 /**
- * gtk_drag_set_icon_pixbuf: (method)
+ * gtk_drag_set_icon_pixbuf:
  * @context: the context for a drag (This must be called 
  *            with a  context for the source side of a drag)
  * @pixbuf: the #GdkPixbuf to use as the drag icon
@@ -2235,7 +2235,7 @@ gtk_drag_set_icon_pixbuf (GdkDragContext *context,
 }
 
 /**
- * gtk_drag_set_icon_stock: (method)
+ * gtk_drag_set_icon_stock:
  * @context: the context for a drag (This must be called 
  *            with a  context for the source side of a drag)
  * @stock_id: the ID of the stock icon to use for the drag
@@ -2302,7 +2302,7 @@ _gtk_cairo_surface_extents (cairo_surface_t *surface,
 }
 
 /**
- * gtk_drag_set_icon_surface: (method)
+ * gtk_drag_set_icon_surface:
  * @context: the context for a drag (This must be called
  *     with a context for the source side of a drag)
  * @surface: the surface to use as icon
@@ -2368,7 +2368,7 @@ gtk_drag_set_icon_surface (GdkDragContext  *context,
 }
 
 /**
- * gtk_drag_set_icon_name: (method)
+ * gtk_drag_set_icon_name:
  * @context: the context for a drag (This must be called 
  *     with a context for the source side of a drag)
  * @icon_name: name of icon to use
@@ -2401,7 +2401,7 @@ gtk_drag_set_icon_name (GdkDragContext *context,
 }
 
 /**
- * gtk_drag_set_icon_gicon: (method)
+ * gtk_drag_set_icon_gicon:
  * @context: the context for a drag (This must be called 
  *     with a context for the source side of a drag)
  * @icon: a #GIcon
@@ -2432,7 +2432,7 @@ gtk_drag_set_icon_gicon (GdkDragContext *context,
 }
 
 /**
- * gtk_drag_set_icon_default: (method)
+ * gtk_drag_set_icon_default:
  * @context: the context for a drag (This must be called 
  *     with a  context for the source side of a drag)
  *